merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 22 Mar 2006 18:18:42 +0000 (19:18 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 22 Mar 2006 18:18:42 +0000 (19:18 +0100)
commitfed2a3f4c431e7497e5bb2e309f14e5082f31d3f
tree7a6936eac072050c4990e76dabc433ba1355b915
parent6a59751ba07bfd40ddccf48c384c5480387513a4
parentc048a39db2e2f075050ba8797a4fbce34c3c9faa
merge with xen-ia64-unstable.hg